Adwaita: Try to fix up selection touch handles

The text handles reuse the style context from their parent widget,
and just add .cursor-handle. That means that the more specific
entry selectors override the .cursor-handle theming unless we
select for .entry.cursor-handle. We also need to work harder to
keep the .entry styling from drawing decorations around the outlines.

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index b7560cccb2a9b05e6f83ab186016cb4ade360c92..f9f10de07cd5750603182de6fae69862f4763385 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1054,9 +1054,12 @@ GtkTreeView.view.progressbar { //Progressbar in treeview cells
 }
 
 //touch selection handlebars for the Popover.osd above
+.entry.cursor-handle,
 .cursor-handle {
   background-color: transparent;
   background-image: none;
+  box-shadow: none;
+  border-style: none;
   &.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); }
   &.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); }
 }

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index acddbd96d202b81acdc9392b4fadec0d46b88403..7ee6b6f4d3c72a88a27f14582812ee9cd70bc44f 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1196,11 +1196,16 @@ GtkTreeView.view.progressbar {
         border-color: rgba(102, 102, 102, 0.8);
         color: #939695; }
 
+.entry.cursor-handle,
 .cursor-handle {
   background-color: transparent;
-  background-image: none; }
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top,
   .cursor-handle.top {
     -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
+  .entry.cursor-handle.bottom,
   .cursor-handle.bottom {
     -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
 

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index fde3cc18538806e389c0fcee23b1a30e93bde2b8..4ed40da049c97c8eb7c9b4401c15621bb328b24f 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1189,11 +1189,16 @@ GtkTreeView.view.progressbar {
         border-color: rgba(102, 102, 102, 0.8);
         color: #8d9091; }
 
+.entry.cursor-handle,
 .cursor-handle {
   background-color: transparent;
-  background-image: none; }
+  background-image: none;
+  box-shadow: none;
+  border-style: none; }
+  .entry.cursor-handle.top,
   .cursor-handle.top {
     -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
+  .entry.cursor-handle.bottom,
   .cursor-handle.bottom {
     -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }